clean up some Variable * is reassigned a value before the old one has been used....

one of these was actually a very old bug.

diff --git a/cst.cc b/cst.cc
index f85dc3cc8bb6f42b0b6fadcc63e2177649f8402f..5dd4ba52ca1e8c6ba9e79bff7dd8b2eb5b714dff 100644 (file)
--- a/cst.cc
+++ b/cst.cc
@@ -254,8 +254,6 @@ cst_data_read()
         }
 
         cst_add_wpt(track, wpt);
-        wpt = nullptr;
-
 
         wpt = new Waypoint;
 

diff --git a/dmtlog.cc b/dmtlog.cc
index 8428de4b213edba94f25be063d42bd2d4a44d1bd..cec7a5d6134bd82d8669c026c1acf555bc716831 100644 (file)
--- a/dmtlog.cc
+++ b/dmtlog.cc
@@ -419,10 +419,9 @@ read_CTrackFile(const int version)
     fatal(MYNAME ": Unknown or invalid track file (%d).\n", ver);
   }
 
-  int32_t ux = gbfgetint32(fin); // Unknown 2
-  ux = gbfgetint32(fin); // Unknown 3
-  ux = gbfgetint32(fin); // Unknown 4
-  (void) ux; // Silence warning.
+  (void) gbfgetint32(fin); // Unknown 2
+  (void) gbfgetint32(fin); // Unknown 3
+  (void) gbfgetint32(fin); // Unknown 4
 
   route_head* track = route_head_alloc();
   track_add_head(track);

diff --git a/garmin.cc b/garmin.cc
index 9b08c7e05201f7fb724c14ba621b49b7cebd5a5d..16060d47c19dd589aaaac845bcbed85eb07d48c6 100644 (file)
--- a/garmin.cc
+++ b/garmin.cc
@@ -853,7 +853,6 @@ sane_GPS_Way_New()
   way->facility[0] = 0;
   way->addr[0] = 0;
   way->cross_road[0] = 0;
-  way->cross_road[0] = 0;
   way->dpth = 1.0e25f;
   way->wpt_class = 0;  // user waypoint by default.
 

diff --git a/gdb.cc b/gdb.cc
index a814c7e24a43f1e73e7eee6afa436b40674a035e..bd54c2c530241d8a40d6675c8e62c8e46825fe59 100644 (file)
--- a/gdb.cc
+++ b/gdb.cc
@@ -844,7 +844,7 @@ read_route()
         bounds.max_alt = FREAD_DBL;
       }
       bounds.min_lat = FREAD_LATLON;
-      bounds.min_lat = FREAD_LATLON;
+      bounds.min_lon = FREAD_LATLON;
       if (FREAD_C == 1) {
         bounds.min_alt = FREAD_DBL;
       }